From 6b8dd7beefee676b7df3638965de17b7d7586eca Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 21 Jul 2014 19:26:41 +0200 Subject: [PATCH] Adwaita: stack switcher button fixes Paddings and outline offset are ok now. --- gtk/resources/theme/Adwaita/_common.scss | 10 ++++++---- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 7 ++++--- gtk/resources/theme/Adwaita/gtk-contained.css | 7 ++++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 44dc302f71..08a123dba7 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -376,12 +376,14 @@ GtkLabel { .header-bar .stack-switcher &.text-button { padding-left: 10px; padding-right: 10px; - padding-top: 5px; // I need these two to not get overridden by radio - padding-bottom: 6px; // button style + padding-top: 5px; // I need these to not get overridden by radio + padding-bottom: 6px; // button style + outline-offset: -3px; // + } .stack-switcher > & { - padding-left: 0; // subtract the padding which will be added to the - padding-right: 0; // GtkLabel + padding-left: 2px; // subtract the padding which will be added to the + padding-right: 2px; // GtkLabel > GtkLabel { padding-left: 6px; // label padding padding-right: 6px; // diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 42f5b16631..23fd35916f 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -493,10 +493,11 @@ padding-left: 10px; padding-right: 10px; padding-top: 5px; - padding-bottom: 6px; } + padding-bottom: 6px; + outline-offset: -3px; } .stack-switcher > .button { - padding-left: 0; - padding-right: 0; } + padding-left: 2px; + padding-right: 2px; } .stack-switcher > .button > GtkLabel { padding-left: 6px; padding-right: 6px; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 71d5726796..1daaf3455e 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -485,10 +485,11 @@ padding-left: 10px; padding-right: 10px; padding-top: 5px; - padding-bottom: 6px; } + padding-bottom: 6px; + outline-offset: -3px; } .stack-switcher > .button { - padding-left: 0; - padding-right: 0; } + padding-left: 2px; + padding-right: 2px; } .stack-switcher > .button > GtkLabel { padding-left: 6px; padding-right: 6px; } -- 2.30.2